Skip to content

chore(sync): merge upstream into livemap - #41

Merged
tomaswitek merged 113 commits into
livemapfrom
sync/upstream-20261119
Nov 19, 2026
Merged

tomaswitek merged 113 commits into
livemapfrom
sync/upstream-20261119

Conversation

@vanessa-livamap-ai

Copy link
Copy Markdown
Contributor

Summary

Sync the fork's upstream mirror main (c1f8459153490d78c0d674b2ce5d749f31aaa4cb, 112 upstream-only commits) into livemap (63184ea4f061fb7fce83dfb7410dda1fdfea83db). This is the follow-up to the 19 Nov sync escalation and the preceding sync in #40. The commit retains both parents in that order; tested merge 9dc16043280450c4e3bf475bd7480d07e3279fdb, tree 204530685cc3347b3355569b6393b055d7c0f4b7.

Both branches extended authScopeRequiredResponse in packages/contracts/src/auth.ts, the only textual conflict. The resolution keeps both legacy error mappings (ari:read → orchestration:read, relay:configure → relay:write). This is response compatibility, not a permission grant: ari:read remains in the standard scopes, relay:configure remains admin-only, and upstream token renewal is unchanged. Existing table coverage in packages/contracts/src/auth.test.ts caught the loss of each mapping separately and passed 30/30 when both were restored.

Fork changes preserved

  • Ari Code branding, icons, themes, desktop identity, Livemap stage label and sidebar thread flags.
  • Relay cards and routing tags, thread actions and PR action menus.
  • Ari team threads, invitations, guest links and handoff, and the Ari settings page.
  • Boxd VM lifecycle support; Limrun device hosts, simulator streaming and screenshots.
  • Livemap directories, installer/release ownership, packaging and release workflows. No workflow delta against livemap; upstream native code is retained without adding fork-specific native features.

Host readback: the verified merge bundle has the expected tree and ordered parents, git show --remerge-diff identified the expected auth resolution, and git diff --check 63184ea4 HEAD passed. The product diff is 569 files versus livemap (+24,055/−4,018), not the Boxd bootstrap patch.

Boxd verification

Node 26.13.1, Vite+ 1.4.0; Claude Code (Opus 5.5). vp i --frozen-lockfile passed. The focused repo-local ./node_modules/.bin/vp test run $(cat /task/work/t3code-focused-tests.txt) ran 45 files: 983 tests passed, 1 skipped, 1 failed. vp run check:changed 63184ea4f061fb7fce83dfb7410dda1fdfea83db ran 236 files in the main test batch (235 passed; 6,996 tests passed, 4 skipped, 1 failed); the second test batch passed both files. Unused patches, format, lint, Knip, GraphQL, typecheck (42 packages) and React compiler checks passed. The command exited 1 for the pre-existing failure below. Playwright Chromium was installed before the final run, resolving missing-browser errors in the first run.

Accepted baseline exception: apps/server/src/provider/AntigravityInstallation.test.ts:697, “explains that the linux-arm64 runtime needs 4 KiB pages when it aborts on a 16 KiB kernel”, failed with expected 'cancelled' to be 'failed'. ./node_modules/.bin/vp test run apps/server/src/provider/AntigravityInstallation.test.ts -t 'explains that the linux-arm64 runtime needs 4 KiB pages when it aborts on a 16 KiB kernel' reproduced the same assertion and exit 1 on unchanged upstream c1f8459 in the same VM environment. The test was not changed; this is the only remaining failure, accepted for PR publication, not a green suite.

vp run --filter @t3tools/web --filter t3 build, vp run build:desktop and node apps/desktop/scripts/verify-preload-bundle.mjs all exited 0. The desktop rerun used the same libsecret-1-dev and pkg-config prerequisites as CI. No full-suite, native-device, release or macOS signing verification is claimed.

Reviewer checks and release

Review the single conflict resolution, then check Settings → Sharing & access → Create link: View Ari is checked by default; Configure relay (admin) is offered but unchecked. The Boxd browser smoke check also showed Ari Code branding and the theme. GitHub CI is intentionally disabled and was not changed. Opening this PR does not advance livemap or trigger its push-based release. No merge or deployment was performed.

juliusmarminge and others added 30 commits November 18, 2026 11:33
… (#38444)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#38712)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…(#37980)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… themselves (#37990)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…(#37980) (#38739)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ems (#38263)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…s (#38740)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s (#38544)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
…(#38683)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…8889)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…(#38772)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
navidnadali and others added 29 commits November 18, 2026 20:54
…s (#38856)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ad (#38890)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…round work details (#38904)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…(#38917)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… (#38825)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…8848)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… the PR merges (#38926)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…(#38867)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5.2 (primary) <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ount (#34194)

Co-authored-by: Nicholas Wasmiller <derped@mnpl.fyi>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…d of the portable archive (#35268)

Co-authored-by: Felix Mrak <180021770+felixleopold@users.noreply.github.com>
Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Merge upstream c1f8459 into livemap
63184ea.

Conflict: packages/contracts/src/auth.ts authScopeRequiredResponse.
Kept both compatibility mappings: fork ari:read reports
orchestration:read and upstream admin-only relay:configure reports
relay:write as requiredScope for clients with the original scope enum.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@tomaswitek
tomaswitek merged commit 225c341 into livemap Nov 19, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.